Update with cm hardware & other changes