Improved the performance and other stuff.