HHServer - Update for the streaming by HHServer - step 2