adding gateway back in