Remote CM stuff that got carried over