Updates to part 2