Fold in Greggman's changes