initial adjustments to template