updated check on server to serverAddress