Major update

Change-Id: I4f8430fa08c08b3d051065ef0eb549992a0eff24