better upgrade selection