changes to fields and improvements to passing data