Some small changes, change updateRotation