template and header changes