Some minor adjsutments to have the first perf numbers