Major edits to my post