WIP

Changes to perf test