8/5 changes
8/6 changes