working version
fix import