initial merge of danube wdt code