more adds

Change-Id: I52970f8cf2026508335043e203f5d8843da20a47