Updated switch transitions