Refactoring rotate to use MPTCs