Performance Improvements

Performance Improvements