We reworked the codes under the hood to improve the performance of the app