Initial changes using the beat the benchmark. #1