10/31 changes, see log for more detail