Corrected some errors that had to do with time to deactivate