S patch 3 (10/27)

S patch 3