Updated for Export Feature