fixed imports, optimized