major performance enhancements