Further editing on part 2