refactored dodo