Updated choice logic