some more diffing changes