adds guard and notifier