some cr's changes