modified to reflect more oSD and single gateway.