Overall Performance Improvements