use more proper field names, add new field code: