changed the processing of the fields