Added code for full river