bridgeClass redone

Same as the previous pull request for this class.