improved unit import