some editing of part 1