still working on the edit note.  commented it out for now