Catching up with upstream