Part 2 bugs