S patch 3 (21/27)

S patch 3