Updated for performance.