removed 2 lines that were accidently left in, and also implemented the  feature
removed 2 lines that were accidently left in, and also implemented the  feature

kmjungersen/BenchmarkDB,kmjungersen/BenchmarkDB,kmjungersen/BenchmarkDB,kmjungersen/BenchmarkDB