Corrected everything
Faster export