Changed WaterChangeMode to use constant for RF class