Part 3/3 of Server Fix