And handle better the two circular case
And handle better the two circular case