changing field names, bug fix