Digest-9 and template changes