edits and comments made to Return