update for non-gateway clients.