changed time span on notifications
pulled adam's changes