XXX Template Modifications