reworked the template