templator improve; rf