Avoid Whichever

Avoid Whichever