The saga continues - I took a sample of the contaminated fuel to a company named Fuel Injection. The owner was very very helpful!! Bottom line there was a lot of water in my fuel. He said that the high pressure of the pump causes the water to be broken down into extremely small particles so it would take a long time for the water to settle out of the sample that I had. I did not expect water because I thought it would lay on the bottom of the jar. He poured some FPPF conditioner in a small sample and WALA the sample looked like diesel! He also mixed a sample with alcohol and again WALA the water looked like a white cloud at the bottom of the jar. My appologies for blaming the dealer on bad work three weeks ago. I ask myself the question, could this have been the reason the car shut down before three weeks ago? They claim thet they checked the fuel tank and it looked OK. SO ,I do have a black cloud over my head with this TDI. I obviously got fuel mixed with water. I only filled up twice since the injection pump was replaced three weeks ago. I took samples from both locations and asked each manager if anyone else had problems and guess what no water in samples and no problems reported. Tanks could have been refilled by now. On top of all of this VW now voided my warranty on my entire fuel system!!! How nice!!