More tweaks for Part 5