adapt to refactoring
upper bound on base
doc changes