adjustments for new server stuff