Updated CircleController and CircleHelper