dded version option
refactoring