add import/export and latest changes