restructure notification and tracking.