Made suggested if-switcharoos