Optimizations

Change-Id: Ibdb727ad87bdc720aa8684e9ca6bc975bfa709dc