WIP: before RangeMap refactoring
WIP: RangeMap refactoring