S000: adding more stuff

Change-Id: I093f4b14ce87161799a3c02907f8b76b76238914