fix movement solver!!!1