add toro and toroplus

Change-Id: I3d2168ae4bd1cb1f769cc76258975eec71a796df