inlined functions, added circle class