River map done right