Added some better timing for notifications