half done server changes