Revise parts discussed at Jun. 19