live streaming code update : starting patch