improved importing