Feature/adjusted benchmark

Newest changes. Not rebased on your feature branch.