Added a check for drive