FIX BUFFERING ISSUES TODAY!