added import logic