Streamlined handling of switches; placed them before TRIALS