minor changes in driver model