template changes to be more universal