impl
#OXTEND-1 in progress  (test service hook again)