added bridged stuff
fixed merge conflicts