Edits to #1