Final Fixes Part 3