Changes made while doing performance testing.