More edits + validate