New version of dw + refactoring + config
New version of dw + refactoring + config