#8, #1 brings template into line with changes created by max