Fixing duration
Working on live streaming