Final Fixes Part 4