Better handling for replacing CP