some speed enhancements
merging
back to production