revert back to some master code in notification.rb