more edits, not done with 2