changed the import function a little but not finished