eneim/toro 3 commits