Add guard
Add notification