reworked templates again