GPII-155: now correctly including the canopy match maker.