Amending Export and fixing bug