14 Commits (fix_note)