Write s where necessary (10/47)

Write s where necessary