Fix update and CS