Added disabled, taking floats for times, mostly for ending clean-up