merge draft controller logic into hierarchical controller