Modify to allow enable disable and to sound notification in multiple use cases