Added 4/1 notes and auto switching