did some editing