Move from path-connected to chain-connected version