Updated b2b for improved Edison/Intel compatibility