Hi I have a 1.7 cdti mk5 astra the heater doesnt work and some one said to change thermostat which i did and it worked, 2 days later it packed in again, car is using a lot of water and had a `sniff test` done head gaskett apparently ok someone said water pump may need changing...please can anyone help...thanks