Added a cleaner way of drawing the circles