7 Commits (fix_note)