left over spurious diff from merge with Aidan's stuff