some speed enhancements