upgrading to use rotations instead

CONSIDER reverting to the last commit.