Implementing some changes / benchmarks.