Put in the where necessary (43/47)

Put in the where necessary