--- ../epc-mib-20061027/EPCGLOBAL-READER-MIB.txt	2007-02-15 08:53:15.000000000 -0600
+++ EPCGLOBAL-READER-MIB.txt	2007-03-08 22:14:08.000000000 -0600
@@ -1,4 +1,4 @@
--- Copyright (c) 2005, 2006 EPCglobal Inc(tm), All Rights Reserved.
+-- Copyright (c) 2005, 2007 EPCglobal Inc(tm), All Rights Reserved.
 EPCGLOBAL-READER-MIB DEFINITIONS ::= BEGIN
                                         
 IMPORTS
@@ -37,7 +37,7 @@
           FROM EPCGLOBAL-SMI-MIB;
           
 epcgReaderMIB MODULE-IDENTITY
-     LAST-UPDATED "200610270000Z"
+     LAST-UPDATED "200703080000Z"
      ORGANIZATION "EPCglobal, Inc."
      CONTACT-INFO         
           "     EPCglobal MIB Administrator
@@ -52,7 +52,7 @@
      DESCRIPTION
           "The MIB Module describing an EPCglobal compliant RFID reader."
           
-     REVISION     "200610270000Z"
+     REVISION     "200703080000Z"
 
      DESCRIPTION
           "Defined in conformance with the EPCglobal Reader Management and
@@ -131,6 +131,14 @@
                      up (3),
                      down (4)
                    }
+
+EpcgAdministrativeStatus ::= TEXTUAL-CONVENTION
+    STATUS            current
+    DESCRIPTION
+        "A value representing administrative status."
+    SYNTAX INTEGER { up (3),
+                     down (4)
+		   }
                 
 EpcgThreshold ::= TEXTUAL-CONVENTION
     STATUS          current
@@ -146,7 +154,8 @@
                      timer (2),
                      continuous (3),
                      ioEdge (4),
-                     vendorExtension (5)
+                     vendorExtension (5),
+                     ioValue (6)
                    }
                    
                    
@@ -229,7 +238,7 @@
               epcgRdrDevTimeUtc,
               epcgReadPointOperNotifyStateLevel,
               epcgReadPointName,
-              epcgReadPointPriorOperStatus,
+              epcgReadPointOperStatusPrior,
               epcgReadPointOperStatus
             }
     STATUS current
@@ -301,7 +310,7 @@
 epcgReaderAntennaEraseFailure NOTIFICATION-TYPE
     OBJECTS { sysName, 
               epcgRdrDevTimeUtc,
-              epcgAntRdPntFailEraseFailuresNotifLevel,
+              epcgAntRdPntEraseFailuresNotifLevel,
               epcgReadPointName,
               epcgAntRdPntEraseFailures,
               epcgAntRdPntNoiseLevel
@@ -355,7 +364,7 @@
               epcgRdrDevTimeUtc,
               epcgSrcOperStatusNotifyLevel,
               epcgSrcName,
-              epcgSrcOperPriorStatus,
+              epcgSrcOperStatusPrior,
               epcgSrcOperStatus
             }
     STATUS current
@@ -985,12 +994,15 @@
         epcgReadPointIndex                     Unsigned32,
         epcgReadPointName                      SnmpAdminString,
         epcgReadPointDescription               SnmpAdminString,
-        epcgReadPointAdminStatus               EpcgOperationalStatus,
+        epcgReadPointAdminStatus               EpcgAdministrativeStatus,
         epcgReadPointOperStatus                EpcgOperationalStatus,
         epcgReadPointOperStateNotifyEnable     TruthValue,
         epcgReadPointOperNotifyFromState       EpcgOperationalEnable,
         epcgReadPointOperNotifyToState         EpcgOperationalEnable,
-        epcgReadPointOperNotifyStateLevel      EpcgNotifLevel
+        epcgReadPointOperNotifyStateLevel      EpcgNotifLevel,
+	epcgReadPointOperStatusPrior           EpcgOperationalStatus,
+	epcgReadPointOperStateSuppressInterval Unsigned32,
+	epcgReadPointOperStateSuppressions     Counter32
           }
 
 epcgReadPointIndex OBJECT-TYPE
@@ -1021,7 +1033,7 @@
     ::= { epcgReadPointEntry 3 }
 
 epcgReadPointAdminStatus OBJECT-TYPE
-    SYNTAX               EpcgOperationalStatus
+    SYNTAX               EpcgAdministrativeStatus
     MAX-ACCESS           read-write
     STATUS               current
     DESCRIPTION
@@ -1083,9 +1095,7 @@
     DEFVAL { error }
     ::= { epcgReadPointEntry 9 }
 
--- Scalars associated with epcgReadPointTable 
-
-epcgReadPointPriorOperStatus OBJECT-TYPE
+epcgReadPointOperStatusPrior OBJECT-TYPE
     SYNTAX                   EpcgOperationalStatus
     MAX-ACCESS               accessible-for-notify
     STATUS                   current
@@ -1093,7 +1103,7 @@
          "The past status of read-point prior to the new status change
           that triggered the epcgReadPointOperationState 
           notifictation."
-    ::= { epcgReadPoints 2 }
+    ::= { epcgReadPointEntry 10 }
 
 epcgReadPointOperStateSuppressInterval OBJECT-TYPE
      SYNTAX      Unsigned32 (0 | 1..3600 )
@@ -1107,7 +1117,7 @@
         Notification will not be suppressed when zero value is 
         specified."
     DEFVAL { 0 }
-    ::= { epcgReadPoints 3 }
+    ::= { epcgReadPointEntry 11 }
 
 epcgReadPointOperStateSuppressions OBJECT-TYPE
      SYNTAX             Counter32
@@ -1117,7 +1127,7 @@
      DESCRIPTION
         "The number of read point operational state change
          notifications that have been suppressed."
-     ::= { epcgReadPoints 4 }
+     ::= { epcgReadPointEntry 12 }
 
 
 --*******************************************************************
@@ -1146,28 +1156,38 @@
     ::= { epcgAntReadPointTable 1 }
 
 EpcgAntReadPointEntry ::= SEQUENCE {
-    epcgAntRdPntTagsIdentified            EpcgCurrentCountSinceReset,
+    epcgAntRdPntTagsIdentified           EpcgCurrentCountSinceReset,
     epcgAntRdPntTagsNotIdentified        EpcgCurrentCountSinceReset,
     epcgAntRdPntMemoryReadOperations     EpcgCurrentCountSinceReset,
     epcgAntRdPntMemoryReadFailures       EpcgCurrentCountSinceReset,
     epcgAntRdPntReadFailureNotifEnable   TruthValue,
     epcgAntRdPntReadFailureNotifLevel    EpcgNotifLevel,
+    epcgAntRdPntReadFailureSuppressInterval Unsigned32,
+    epcgAntRdPntReadFailureSuppressions  Counter32,
     epcgAntRdPntWriteOperations          EpcgCurrentCountSinceReset,
     epcgAntRdPntWriteFailures            EpcgCurrentCountSinceReset,
     epcgAntRdPntWriteFailuresNotifEnable TruthValue,
     epcgAntRdPntWriteFailuresNotifLevel  EpcgNotifLevel,
+    epcgAntRdPntWriteFailureSuppressInterval Unsigned32,
+    epcgAntRdPntWriteFailureSuppressions  Counter32,
     epcgAntRdPntKillOperations           EpcgCurrentCountSinceReset,
     epcgAntRdPntKillFailures             EpcgCurrentCountSinceReset,
     epcgAntRdPntKillFailuresNotifEnable  TruthValue,
     epcgAntRdPntKillFailuresNotifLevel   EpcgNotifLevel,
+    epcgAntRdPntKillFailureSuppressInterval Unsigned32,
+    epcgAntRdPntKillFailureSuppressions  Counter32,
     epcgAntRdPntEraseOperations          EpcgCurrentCountSinceReset,
     epcgAntRdPntEraseFailures      EpcgCurrentCountSinceReset,
     epcgAntRdPntEraseFailuresNotifEnable     TruthValue,
-    epcgAntRdPntFailEraseFailuresNotifLevel     EpcgNotifLevel,
+    epcgAntRdPntEraseFailuresNotifLevel     EpcgNotifLevel,
+    epcgAntRdPntEraseFailureSuppressInterval Unsigned32,
+    epcgAntRdPntEraseFailureSuppressions  Counter32,
     epcgAntRdPntLockOperations           EpcgCurrentCountSinceReset,
     epcgAntRdPntLockFailures             EpcgCurrentCountSinceReset,
     epcgAntRdPntLockFailuresNotifEnable TruthValue,
     epcgAntRdPntLockFailuresNotifLevel  EpcgNotifLevel,
+    epcgAntRdPntLockFailureSuppressInterval Unsigned32,
+    epcgAntRdPntLockFailureSuppressions  Counter32,
     epcgAntRdPntPowerLevel               Integer32,
     epcgAntRdPntNoiseLevel               Integer32, 
     epcgAntRdPntTimeEnergized            EpcgCurrentCountSinceReset
@@ -1239,6 +1259,30 @@
     DEFVAL { error }
     ::= { epcgAntReadPointEntry 5 }
 
+epcgAntRdPntReadFailureSuppressInterval OBJECT-TYPE
+     SYNTAX      Unsigned32 (0 | 1..3600 )
+     UNITS       "seconds"
+     MAX-ACCESS  read-write
+     STATUS      current
+     DESCRIPTION
+       "The length of the interval used to suppress generation 
+        of epcgReaderAntennaReadFailure notifications.
+        
+        Notification will not be suppressed when zero value is 
+        specified."
+    DEFVAL { 0 }
+    ::= { epcgAntReadPointEntry 26 }
+
+epcgAntRdPntReadFailureSuppressions OBJECT-TYPE
+     SYNTAX             Counter32
+     UNITS             "notifications"
+     MAX-ACCESS         read-only
+     STATUS             current
+     DESCRIPTION
+        "The number of epcgReaderAntennaReadFailure
+         notifications that have been suppressed."
+     ::= { epcgAntReadPointEntry 27 }
+
 epcgAntRdPntWriteOperations OBJECT-TYPE
     SYNTAX      EpcgCurrentCountSinceReset
     UNITS       "write operations"
@@ -1283,6 +1327,30 @@
     DEFVAL { notice }
     ::= { epcgAntReadPointEntry 9 }
 
+epcgAntRdPntWriteFailureSuppressInterval OBJECT-TYPE
+     SYNTAX      Unsigned32 (0 | 1..3600 )
+     UNITS       "seconds"
+     MAX-ACCESS  read-write
+     STATUS      current
+     DESCRIPTION
+       "The length of the interval used to suppress generation 
+        of epcgReaderAntennaWriteFailure notifications.
+        
+        Notification will not be suppressed when zero value is 
+        specified."
+    DEFVAL { 0 }
+    ::= { epcgAntReadPointEntry 28 }
+
+epcgAntRdPntWriteFailureSuppressions OBJECT-TYPE
+     SYNTAX             Counter32
+     UNITS             "notifications"
+     MAX-ACCESS         read-only
+     STATUS             current
+     DESCRIPTION
+        "The number of epcgReaderAntennaWriteFailure
+         notifications that have been suppressed."
+     ::= { epcgAntReadPointEntry 29 }
+
 epcgAntRdPntKillOperations OBJECT-TYPE
     SYNTAX                 EpcgCurrentCountSinceReset
     UNITS                  "kill operations"
@@ -1327,6 +1395,30 @@
     DEFVAL { notice }
     ::= { epcgAntReadPointEntry 13 }
 
+epcgAntRdPntKillFailureSuppressInterval OBJECT-TYPE
+     SYNTAX      Unsigned32 (0 | 1..3600 )
+     UNITS       "seconds"
+     MAX-ACCESS  read-write
+     STATUS      current
+     DESCRIPTION
+       "The length of the interval used to suppress generation 
+        of epcgReaderAntennaKillFailure notifications.
+        
+        Notification will not be suppressed when zero value is 
+        specified."
+    DEFVAL { 0 }
+    ::= { epcgAntReadPointEntry 30 }
+
+epcgAntRdPntKillFailureSuppressions OBJECT-TYPE
+     SYNTAX             Counter32
+     UNITS             "notifications"
+     MAX-ACCESS         read-only
+     STATUS             current
+     DESCRIPTION
+        "The number of epcgReaderAntennaKillFailure
+         notifications that have been suppressed."
+     ::= { epcgAntReadPointEntry 31 }
+
 epcgAntRdPntEraseOperations OBJECT-TYPE
     SYNTAX                  EpcgCurrentCountSinceReset
     UNITS                   "erase operations"
@@ -1362,7 +1454,7 @@
                 changes has been disabled." 
     ::= { epcgAntReadPointEntry 16 }
 
-epcgAntRdPntFailEraseFailuresNotifLevel  OBJECT-TYPE
+epcgAntRdPntEraseFailuresNotifLevel  OBJECT-TYPE
     SYNTAX                        EpcgNotifLevel
     MAX-ACCESS                    read-write
     STATUS                        current
@@ -1372,6 +1464,30 @@
     DEFVAL { notice }
     ::= { epcgAntReadPointEntry 17 }
 
+epcgAntRdPntEraseFailureSuppressInterval OBJECT-TYPE
+     SYNTAX      Unsigned32 (0 | 1..3600 )
+     UNITS       "seconds"
+     MAX-ACCESS  read-write
+     STATUS      current
+     DESCRIPTION
+       "The length of the interval used to suppress generation 
+        of epcgReaderAntennaEraseFailure notifications.
+        
+        Notification will not be suppressed when zero value is 
+        specified."
+    DEFVAL { 0 }
+    ::= { epcgAntReadPointEntry 32 }
+
+epcgAntRdPntEraseFailureSuppressions OBJECT-TYPE
+     SYNTAX             Counter32
+     UNITS             "notifications"
+     MAX-ACCESS         read-only
+     STATUS             current
+     DESCRIPTION
+        "The number of epcgReaderAntennaEraseFailure
+         notifications that have been suppressed."
+     ::= { epcgAntReadPointEntry 33 }
+
 epcgAntRdPntLockOperations OBJECT-TYPE
     SYNTAX                 EpcgCurrentCountSinceReset
     UNITS                  "lock operations"
@@ -1418,6 +1534,30 @@
     DEFVAL { notice } 
     ::= { epcgAntReadPointEntry 21 }
 
+epcgAntRdPntLockFailureSuppressInterval OBJECT-TYPE
+     SYNTAX      Unsigned32 (0 | 1..3600 )
+     UNITS       "seconds"
+     MAX-ACCESS  read-write
+     STATUS      current
+     DESCRIPTION
+       "The length of the interval used to suppress generation 
+        of epcgReaderAntennaLockFailure notifications.
+        
+        Notification will not be suppressed when zero value is 
+        specified."
+    DEFVAL { 0 }
+    ::= { epcgAntReadPointEntry 34 }
+
+epcgAntRdPntLockFailureSuppressions OBJECT-TYPE
+     SYNTAX             Counter32
+     UNITS             "notifications"
+     MAX-ACCESS         read-only
+     STATUS             current
+     DESCRIPTION
+        "The number of epcgReaderAntennaLockFailure
+         notifications that have been suppressed."
+     ::= { epcgAntReadPointEntry 35 }
+
 epcgAntRdPntPowerLevel OBJECT-TYPE
     SYNTAX             Integer32(-2147483648..2147483647) 
     MAX-ACCESS         read-only
@@ -1455,42 +1595,6 @@
          was cleared."
     ::= { epcgAntReadPointEntry 24 }
 
--- Scalars associated with the epcgAntReadPointTable.
-
-epcgAntRdPntSuppressInterval OBJECT-TYPE
-     SYNTAX      Unsigned32 (0 | 1..3600 )
-     UNITS       "seconds"
-     MAX-ACCESS  read-write
-     STATUS      current
-     DESCRIPTION
-       "The length of the interval used to suppress generation 
-        of the following notifications.
-        
-          epcgReaderAntennaReadFailure
-          epcgReaderAntennaWriteFailure
-          epcgReaderAntennaKillFailure
-          epcgReaderAntennaEraseFailure
-          epcgReaderAntennaLockFailure
-          
-        Each antenna can only generate one of these
-        notifications per the interval specifed by
-        this object.  Here is an example were interval is
-        set to 15 seconds.
-        
-        Time  Device       Error Type     Action
-        ----- ------------ -------------  ----------------------
-        09:00 Antenna[1.1] Read Failure   generates notification
-        09:01 Antenna[1.2] Read Failure   generates notification
-        09:05 Antenna[1.1] Read Failure   suppress notification 
-        09:06 Antenna[1.1] Write Failure  generates notification
-        09:16 Antenna[1.1] Read Failure - generates notification
-    
-        Notification will not be suppressed when zero value is 
-        specified."
-    DEFVAL { 0 }
-    ::= { epcgAntennaReadPoints 2 }
-
-
 --*******************************************************************
 --** IO Ports
 --*******************************************************************
@@ -1517,13 +1621,16 @@
 EpcgIoPortEntry ::= SEQUENCE {
          epcgIoPortIndex                     Unsigned32,
          epcgIoPortName                      SnmpAdminString,
-         epcgIoPortAdminStatus               EpcgOperationalStatus,
+         epcgIoPortAdminStatus               EpcgAdministrativeStatus,
          epcgIoPortOperStatus                EpcgOperationalStatus,
          epcgIoPortOperStatusNotifEnable     TruthValue,
          epcgIoPortOperStatusNotifLevel      EpcgNotifLevel,
          epcgIoPortOperStatusNotifFromState  EpcgOperationalEnable,
          epcgIoPortOperStatusNotifToState    EpcgOperationalEnable,
-         epcgIoPortDescription               SnmpAdminString
+         epcgIoPortDescription               SnmpAdminString,
+	 epcgIoPortOperStatusPrior           EpcgOperationalStatus,
+	 epcgIoPortOperStateSuppressInterval Unsigned32,
+	 epcgIoPortOperStateSuppressions     Counter32
 }
 
 epcgIoPortIndex OBJECT-TYPE
@@ -1546,7 +1653,7 @@
         ::= { epcgIoPortEntry 2 }
 
 epcgIoPortAdminStatus OBJECT-TYPE
-    SYNTAX          EpcgOperationalStatus
+    SYNTAX          EpcgAdministrativeStatus
     MAX-ACCESS      read-write
     STATUS          current
     DESCRIPTION
@@ -1615,8 +1722,6 @@
        "The operator's textual description of the IO Port."
         ::= { epcgIoPortEntry 9 }
 
--- Scalars associated with epcgIoPortTable 
-
 epcgIoPortOperStatusPrior OBJECT-TYPE
     SYNTAX          EpcgOperationalStatus
     MAX-ACCESS      accessible-for-notify
@@ -1624,7 +1729,7 @@
     DESCRIPTION
          "Status of IO port prior to status change that 
           triggered THIS epcgReaderIoPortOperationState."
-        ::= { epcgIoPorts 2 }
+        ::= { epcgIoPortEntry 10 }
 
 epcgIoPortOperStateSuppressInterval OBJECT-TYPE
      SYNTAX      Unsigned32 (0 | 1..3600 )
@@ -1638,7 +1743,7 @@
         Notification will not be suppressed when zero value is 
         specified."
     DEFVAL { 0 }
-    ::= { epcgIoPorts 3 }
+    ::= { epcgIoPortEntry 11 }
 
 epcgIoPortOperStateSuppressions OBJECT-TYPE
      SYNTAX             Counter32
@@ -1648,7 +1753,7 @@
      DESCRIPTION
         "The number of IO port state change 
          notifications that have been suppressed."
-     ::= { epcgIoPorts 4 }
+     ::= { epcgIoPortEntry 12 }
                 
 --*******************************************************************
 --** (Logical) Sources (of tag data)
@@ -1693,13 +1798,16 @@
         epcgSrcObservedToLostTrans      EpcgCurrentCountSinceReset,
         epcgSrcLostToGlimpsedTrans      EpcgCurrentCountSinceReset,
         epcgSrcLostToUnknownTrans       EpcgCurrentCountSinceReset,
-        epcgSrcAdminStatus              EpcgOperationalStatus,
+        epcgSrcAdminStatus              EpcgAdministrativeStatus,
         epcgSrcOperStatus               EpcgOperationalStatus,
         epcgSrcOperStatusNotifEnable    TruthValue,
         epcgSrcOperStatusNotifFromState EpcgOperationalEnable,
         epcgSrcOperStatusNotifToState   EpcgOperationalEnable,
         epcgSrcOperStatusNotifyLevel    EpcgNotifLevel,
-        epcgSrcSupportsWriteOperations  TruthValue
+        epcgSrcSupportsWriteOperations  TruthValue,
+        epcgSrcOperStatusPrior          EpcgOperationalStatus,
+        epcgSrcOperStateSuppressInterval Unsigned32,
+        epcgSrcOperStateSuppressions    Counter32
 }
 
 epcgSrcIndex OBJECT-TYPE
@@ -1847,7 +1955,7 @@
     ::= { epcgSourceEntry 15 }
 
 epcgSrcAdminStatus OBJECT-TYPE
-    SYNTAX          EpcgOperationalStatus
+    SYNTAX          EpcgAdministrativeStatus
     MAX-ACCESS      read-write
     STATUS          current
     DESCRIPTION
@@ -1919,10 +2027,7 @@
          'false' - source supports only read operations."
     ::= { epcgSourceEntry 22 }
 
-
--- Scalars associated with the epcgSourceTable. 
-
-epcgSrcOperPriorStatus OBJECT-TYPE
+epcgSrcOperStatusPrior OBJECT-TYPE
     SYNTAX          EpcgOperationalStatus
     MAX-ACCESS      accessible-for-notify
     STATUS          current
@@ -1930,7 +2035,7 @@
          "Status of EPC data source prior to status change that
           triggered the epcgReaderSourceOperationState
           notification."
-    ::= { epcgSources 2 }
+    ::= { epcgSourceEntry 23 }
 
 epcgSrcOperStateSuppressInterval OBJECT-TYPE
      SYNTAX      Unsigned32 (0 | 1..3600 )
@@ -1944,7 +2049,7 @@
         Notification will not be suppressed when zero value is 
         specified."
     DEFVAL { 0 }
-    ::= { epcgSources 5 }
+    ::= { epcgSourceEntry 24 }
 
 epcgSrcOperStateSuppressions OBJECT-TYPE
      SYNTAX             Counter32
@@ -1954,7 +2059,7 @@
      DESCRIPTION
         "The number of source operational state change 
          notifications that have been suppressed."
-     ::= { epcgSources 6 }
+    ::= { epcgSourceEntry 25 }
 
 --*******************************************************************
 --** Notification Channels
@@ -1986,12 +2091,15 @@
           epcgNotifChanAddress            InetAddress,
           epcgNotifChanLastAttempt        DateAndTime,
           epcgNotifChanLastSuccess        DateAndTime,
-          epcgNotifChanAdminStatus        EpcgOperationalStatus,
+          epcgNotifChanAdminStatus        EpcgAdministrativeStatus,
           epcgNotifChanOperStatus         EpcgOperationalStatus,
           epcgNotifChanOperNotifEnable    TruthValue,
           epcgNotifChanOperNotifLevel     EpcgNotifLevel,
           epcgNotifChanOperNotifFromState EpcgOperationalEnable,
-          epcgNotifChanOperNotifToState   EpcgOperationalEnable
+          epcgNotifChanOperNotifToState   EpcgOperationalEnable,
+	  epcgNotifChanOperStatusPrior           EpcgOperationalStatus,
+	  epcgNotifChanOperStateSuppressInterval Unsigned32,
+	  epcgNotifChanOperStateSuppressions     Counter32
 }
 
 epcgNotifChanIndex OBJECT-TYPE
@@ -2050,7 +2158,7 @@
     ::= { epcgNotificationChannelEntry 6 }
 
 epcgNotifChanAdminStatus OBJECT-TYPE
-    SYNTAX          EpcgOperationalStatus
+    SYNTAX          EpcgAdministrativeStatus
     MAX-ACCESS      read-write
     STATUS          current
     DESCRIPTION
@@ -2112,8 +2220,6 @@
     DEFVAL { { unknown, other, up, down} }
     ::= { epcgNotificationChannelEntry 12 }
 
--- Scalars associated with epcgNotificationChannelTable
-
 epcgNotifChanOperStatusPrior OBJECT-TYPE
     SYNTAX          EpcgOperationalStatus
     MAX-ACCESS      accessible-for-notify
@@ -2122,7 +2228,7 @@
         "The status of notification channel prior to the current 
          status  change that triggered the 
          epcgReaderNotificationChanOperState notification"
-    ::= { epcgNotificationChannels 2 }
+    ::= { epcgNotificationChannelEntry 13 }
 
 epcgNotifChanOperStateSuppressInterval OBJECT-TYPE
      SYNTAX      Unsigned32 (0 | 1..3600 )
@@ -2136,7 +2242,7 @@
         Notification will not be suppressed when zero value is 
         specified."
     DEFVAL { 0 }
-    ::= { epcgNotificationChannels 3 }
+    ::= { epcgNotificationChannelEntry 14 }
 
 epcgNotifChanOperStateSuppressions OBJECT-TYPE
      SYNTAX             Counter32
@@ -2146,7 +2252,7 @@
      DESCRIPTION
          "The number of channel operational state change 
         notifications that have been suppressed."
-     ::= { epcgNotificationChannels 4 }
+     ::= { epcgNotificationChannelEntry 15 }
 
 --*******************************************************************
 --** Triggers
@@ -2569,7 +2675,7 @@
                   epcgReadPointOperNotifyFromState,
                   epcgReadPointOperNotifyToState,
                   epcgReadPointOperNotifyStateLevel,
-                  epcgReadPointPriorOperStatus,
+                  epcgReadPointOperStatusPrior,
                   epcgReadPointOperStateSuppressInterval,
                   epcgReadPointOperStateSuppressions
                 }
@@ -2595,7 +2701,7 @@
                    epcgAntRdPntEraseOperations,
                    epcgAntRdPntEraseFailures,
                    epcgAntRdPntEraseFailuresNotifEnable,
-                   epcgAntRdPntFailEraseFailuresNotifLevel,
+                   epcgAntRdPntEraseFailuresNotifLevel,
                    epcgAntRdPntLockOperations,
                    epcgAntRdPntLockFailures,
                    epcgAntRdPntLockFailuresNotifEnable,
@@ -2612,7 +2718,17 @@
     
 
 epcgReaderAntennaSuppressNotifyGroup OBJECT-GROUP
-    OBJECTS     { epcgAntRdPntSuppressInterval }
+    OBJECTS     { epcgAntRdPntReadFailureSuppressInterval, 
+		  epcgAntRdPntReadFailureSuppressions,
+		  epcgAntRdPntWriteFailureSuppressInterval,
+		  epcgAntRdPntWriteFailureSuppressions,
+		  epcgAntRdPntKillFailureSuppressInterval,
+		  epcgAntRdPntKillFailureSuppressions,
+		  epcgAntRdPntEraseFailureSuppressInterval,
+		  epcgAntRdPntEraseFailureSuppressions,
+		  epcgAntRdPntLockFailureSuppressInterval,
+		  epcgAntRdPntLockFailureSuppressions
+                }
     STATUS      current
     DESCRIPTION
        "Reader - Antenna Read Point suppress notifications."
@@ -2659,10 +2775,9 @@
                   epcgSrcOperStatusNotifToState,
                   epcgSrcOperStatusNotifyLevel,
                   epcgSrcSupportsWriteOperations,
-                  epcgSrcOperPriorStatus,
+                  epcgSrcOperStatusPrior,
                   epcgSrcOperStateSuppressInterval,
                   epcgSrcOperStateSuppressions
-                  
                 }
     STATUS      current
     DESCRIPTION

