corrected templates