Switched to if's