fix memory and change mover