New Optimizations

Change-Id: Id296e557849db2a057637ee50bf88b6a97d5d059