Updated with new DDE stuff