refactoring, adding stubs