Rearranged some stuff in the driver