refactored notes and created better flow