Performance Improvements.