Large updates and performance improvements.