update new cm stuff