added missing logical operators