more changes to simplify the bridge