some adjustments for the new server