Lots of performance improvements!