changed field names and tpl