Rivers generation improved