My new edits, what do you think?