CM: some random updates