Back to my original comments. Yes I was assuming the injectors could be upgraded since I did the same on my 01 TDI. So now I know I can't do that. On the clutch, since I am mating the AAZ engine to an 82 Caddy that used to have a 1.6 NA with 5 spd. Will the flywheel on the AAZ engine fit in the bellhousing of the 5 spd? I am assuming that it is larger than the stock 1.6NA. I think the stock 1.6 is a 200mm and the AAZ is a 210mm but I'm not sure. I'm trying to get the parts bought before I tear it all apart. Thanks to all for your help.