datapaths adapted