Changes continue (6/27)

Changes continue