change to new fields