Put in the where necessary (14/47)

Put in the where necessary