added mroe edits