Improved exporting - still ONGOING