Changed nonserver specific functions to more server specific