More work on part 2