templates improved