updated import logic