Optimizations

Change-Id: Ia177e7b22fcc7e2096d947c7f15bf176e1d82ebd