Added more bridge logic