I've prepared a draft of the changes noted above (some small additional modifications on the StandardTemplateHash described in the BIP), but have not yet updated the main branches for the BIP to leave time for any further feedback. See below: BIP: https://github.com/JeremyRubin/bips/blob/ctv-v2/bip-ctv.mediawiki Implementation: https://github.com/JeremyRubin/bitcoin/tree/checktemplateverify-v2 Thank you for your feedback, Jeremy -- @JeremyRubin