Changes to accomodate benchmarker. Which freezes my computer.