Various changes needed for canopy project