fixed bug with circles, converted struct into class