added circle class
conflict shit