trying to fix migrants, still some issues