added the || part