adjusted templates to general form