High optimization

Change-Id: I3d77e3c9339e5ffcb931dd2a81588de4c68ef0fe