Also make the import routine row-based