updated to make conveyor home friendlier to all components, not just core