more edits to base template