added upstream and manual entry