- refactoring of wed construction (incomplete)