Edits on cmp + flex