Can't you combine this 2 if statements now?