Option 2 - Improving Performance