added hammerhead, toro, and toroplus