ongoing edits

edits