Major optimization

Change-Id: I77bc1fadaa4648b802cc83bd891b430f181be7ef