Changed Main class for easier benchmarking