minor refactoring, and new cut points sets