CM: first commit
CM: update config