Introduce parameter to keep range of values