Changes continue (8/27)

Changes continue