added more events and notifications