made some import modifications