small changes in move selection logic