Fixed CP search
Merge