chamge to move data to fields