switched to using base template