adding more tweaks to these templates