Updated driving routines (dirs probably still wrong)