Folded in John's Changes