Did some optimizing for the client connection.