added a bit more to improve the importing routines