HLS Integration ongoing changes