More aggressive optimization and got >10% improvement!