many updates and improvements to get to 2.0