updated to base template