updates

Change-Id: Id2ae9bc098dcace32c08dde7cedb99001a6bbfb4
copy more things

Change-Id: I05d14a4bf246d07559d84435d551cc1b79519bbc