My pump is going to be replaced before the end of my warranty - The only downside is they want the car with an almost empty tank. At this time of year it will be difficult for me, I'll have to make an effort to use the car - they can withdraw the fuel but say that they wont return it to the tank for the fear of contamination!
