changes in class Server