moved some switches