Massive performance improvements