now providing the parent as the against parameter to diff, so there are fewer lookups