split out into two steps importing