My son got a new mini monster

He loves the car, been dealing with a leaky windshield or I guess the sunroof drain. Took it to the dealer to get them to fix it. They had it for a day and said all was good. Rained two days later and leaking worse. Lol. They have done the work so far for free, which is good as he bought it no warranty (114,000 miles on it). So hopefully they are willing to give the repair another attempt. I am optimistic as my brother in law is one of their technicians that they will stand behind it as it started leaking less than 24 hours after buying it. They are the largest vw dealer in a 500 mile radius, lol, they say anyway. I am really hoping he can leave it completely stock.