modified ServerController