improve for Rotation and missing Components