Streamlined, added benchmarks