eneim/toro 11 commits