Uncomment change line mechanism in Driver class and fix bug in it.