w/o upstream