updated to CM 2.23