S patch 3 (17/27)

S patch 3