Fix  Cs, address modifications