added upstream support