improved the server