Changed the gateway to respect order of listing.