Add check for Or