Added more upstream work