digging into performance. Last use of when 2.x
bug fixes and stress investigation