refactor import to use one queue - significant speedup