eneim/toro 8 commits