April 21st 2020: Performance Improvements