Rewrite of push notify functions