Major optimization

Change-Id: I298550bbd12398d3b98294c682f3378609712790