Put in the where necessary (20/47)

Put in the where necessary