A bit more work on part 2