Finished my edits take a look