Yeah, they really screwed you if you opted to keep the car. My dad has a TDI and wanted to keep it but the number of hoops to jump through was ridiculous. Plus they wouldn't have the fix for a year and he couldn't get a sticker for the car without it. Ended up doing the buyback instead.