more work on part 1