updated moveswitch so that fields get unblocked