refactor, new stubs