refactor for round selection