Completed new import script and optimized for speed