Updated Current drive code and added possible bug fix