Modify for CM-10.1