Improved performance significantly