Added river2 and river3 resources. Optimised code.