more adds

Change-Id: I5b660c261c493590a5c3457ac15018ff077c9b1a