Added gateway stuff...