make new base
test refactor