Working on fixing perf
tuning library addition