Big update

Change-Id: I7785d6de1edfea111df5f2f516ec74d75d5150b1