improved behavior of server