edits, after looking at the code