change the way of importing