Port upstream changes over