Incorporate changes since June