Template modify

closes #348