finished my own edits