made it work better with the server connection