Corrected templates