some modification about moves