Part 2 updated