Modified Driver to work with different situations.