Added circle and teardrop shapes