Updated DIST branch