update the performance test...
merge conflicts