Added option to draw circles instead of squares