refined circle solutions adjusted, more reorganization