FInal export modifications