adapting for poc-7 final (eth:45)