River prototype added
improved river support