merge taylorleese's additions to notify on back to normal