performance improved (significantly) but still not where I want it to be.  Also 3 tests are failing.