Tested non-circles, needed some slight changes