More changes to the notifications.  Hopefully making them accurate!