edits to re-add comments per request