Chris made some performance enhancements