Made Some changes to the bridge that may need to be merged