modify to take notifier client
remove test until can only test this package, v1.3