continue rafactoring