Merged Maria's note controller and note additions to show path