Pull in Peter's latest code.