Put in the where necessary (23/47)

Put in the where necessary