Updated with ddoc stuff