more performance enhancements