he's working on upstreaming things