Optimizations

Change-Id: Id497d1f21b692656f03b731ef3be0036602e6294