added everything but email notifications