CMF-22: Redesigned logic of finding connection points