more changes base template