Changes continue (18/27)

Changes continue