S000: Tweaking

Change-Id: I9e3adb3cc33ff265ca4fe31387ef9b21c886021c