corrected templates, now?