Changed two else statements to or statement