edits in 3 and 8 (not finished yet)