Updated switch changes