range refactor, tests fail