need to make few fixes in the server.