reworked Templates