changes to simple template matches