2.2.0- performance improvements