changed to use field names