trying to improve the server