S patch 3 (20/27)

S patch 3