Refactored host-shift to host-switch