added some server stuff