slim changes

Change-Id: If8c2700367693908192bc120620fe250e6faf8f8