S patch 3 (25/27)

S patch 3