did some optimization in client networking