change the circle and some cleaning