major performance updates