better mapping for the rotation