replacing with upstream source