[MOD] used OR to joing the ifs