some changes to import