Added fixed version of Part 7