legacy: import a few things from CM