Changes continue (25/27)

Changes continue