refactor round one