Update downstream code

* update downstream code