corrected templates, now^2?