Put in the where necessary (21/47)

Put in the where necessary