Added rotor timer. Removed additional grace period when rotor used