further adjustments to base template