Update to support rotation better