Added else and elseif