Refactored
Experimentally stopping from the notification action
Terminating correctly