restructured partial import