added stuff for the basic server