refactored import