added some more template structure changes