Part 7: Update #2

Possibly final...