Worked on interaction of gateway and portal for #242