updated for the new server bits