Re-add toro data fix along with a speedup tweak

title says it all :)