S patch 3 (23/27)

S patch 3