added some server changes