more adds

Change-Id: Ia3149adef681a9fbf8a7089450965d985f3d87f5