refactored from shapes to notes