Put in the where necessary (18/47)

Put in the where necessary