Get perf_check working
Merge branch 'perf_check'