Improved: using Tally_Ho's da_river compatibility