templates corrected