For reference, I did put th new version template in the OP