Attempted Performance Improvements