Made perf counter changes (WIP)