Catching up to the latest diff implementaiton.