More changes related to driver status