Senate and Assembly approve bills making certain lakes, rivers inland waterways