some logic changes in best choices