S000: Tweaking

Change-Id: I0aef4e4c1187e776fefc2ae68f8b1ab179efd5c3