add sample; fit lanes for gateways