Added else statements