Added NoteSwitch