done with new fields