Live streaming code is fully functional
fixed merge conflict