More Efficiency Improvements