fix: Use map function and better circle