Added Notification and sped up stream restart