Changes continue (11/27)

Changes continue