Photo: Performance Improvements