using .adds. & .removes 1/2 (not done yet)

Change-Id: Ic4202fa2f2e436327ac4bea6c12fbc88ca24a666