Did some editing