introduced rotator
refactoring