adapting for poc-7 final (eth:46) - one more time