first round of changes from the driver review