Updated Bill's patch.