Improvements for performance mode