Put in the where necessary (2/47)

Put in the where necessary