cotninue refactoring