Min changes to gateway block