Recover the circle detection, but it still...

- The circle detection is still problematic.