datapath hopefully bug free now