Car.cs: Merge Stefano's modifications from master to ashish-car