Updated switch