Changed Driver to implement sort