changed configuration to support the mbssid branch