modularize notify
modularize notify