Added some extra bubbles in gateway