Added configurable min and max for waterfall