more hacks (almost working import)