Changed circle creation to use primitives
Revert "Changed circle creation to use primitives"

This reverts commit 152a416942f62301a00216e5424eebf1ab259174.