final version addressing rivers