importing more fixes