clean up the bridge logic so that it actually works now during relay