Working on a better perf module