Working on fising the server issues