modified for all notificaion & export data