Write s where necessary (6/47)

Write s where necessary