Put in the where necessary (17/47)

Put in the where necessary