switch to the new server construct