some editing ...