added some code for new fields