moved some code
reverted import_export in favor of facts only version