Put in the where necessary (42/47)

Put in the where necessary