Part 2/3 Of Server Fix