Added notification and sped up stream restart