Import data tweak
Some more dirty hacks for getting around the data