Upstream recyclist changes