Quite a bit of edits