Updated gateway