edits; change order