Still fixing the server connection