Stuart's changes to diff rot