adding all changes since early July