General Editing - Step 6 Needs Further Work