Switch and buzzer updated