Version 3, added Circle and UsingShapes.