Last edits for 2/4