Added drive switching capability