Updated eval_moves method