Fixed final edits 2