Adding guard and terminal notifier