a few tweaks to test importing