Again did a lot optimizations.