#IT-3 Fixed

Finished the performance optimization