refactoring to add ranges to more objects.