reworked export, import done