Second level of changes.
-The benchmark runs fine now.