updated templates due to new structure