update to work with latest CM/SM