changes to driver and parser