update notification system: address frankrousseau's comments