- Optimized GPU and removed switch