ID 35: Updated for performance.