Modified the templates to handle the data properly and ehp.