bug fixed & new Import func