restructure notification
restructure