Circle improved again and again and again :p