Minor Changes to driver. Updated Handler