Refactoring river. Something's off about Oldest first.