new cf & cm; improvements