Updated switch commands