added code to preserve oldField name