refactoring + round