6 Commits (fix_note)