New design for river (more humanized!)