simplified templates
updated templates