Changes for range limit