More OPTIMIZATIONS

Change-Id: Ibdc39b9e29bb34b4f892e02be814e6d9c1df7ead