Updated to allow the editing of comments [this is for you, Haley]