Changing out thermostat

What is your question?

My 2000 Audi A6 over heats after it has been driven for may be an hour or more. The temp. guage will rise when at a red light. Once car is moving tempurture guage goes back to the normal range.Is it the thermostat or a bad water pump.