Improvements to the homing configuration