Final changes for performance testing.