Major optimization

Change-Id: I85b019616435e0b90838c4c01ebbad18f48f26d7