Some changes from CM