Changes continue (4/27)

Changes continue