2nd modification following the template format