Solved the performance problem