refactored to simplify the rotator call
fixed delay and refactored more