move needs fixes