Optimization. Still takes too long.