Improving import but still WIP