trying to fix templates