Project Plan Z - Part 2 continuation