Massive performance updates