Updated with latest dist code from ADE