Improved rotation to don't need rotationPoint if missing