rearranged templates and localised errors