new note
fixes
new note
refactor
new note
merge dev