Improved performance and better UI