diff --git a/src/GamCommands.txt b/src/GamCommands.txt
index 57447f22..1338655f 100644
--- a/src/GamCommands.txt
+++ b/src/GamCommands.txt
@@ -1124,7 +1124,7 @@ gam calendar <CalendarEntity> printacl [todrive <ToDriveAttribute>*] [formatjson
         available|
         (colorindex|colorid <EventColorIndex>))|
         (description <String>)|
-        (end|endtime (allday <Date>)|<Time>)|
+        (end (allday <Date>)|<Time>)|
         (guestscaninviteothers <Boolean>)|
         guestscantinviteothers|
         (guestscanmodify <Boolean>)|
@@ -1145,7 +1145,7 @@ gam calendar <CalendarEntity> printacl [todrive <ToDriveAttribute>*] [formatjson
         (sequence <Integer>)|
         (sharedproperty <PropertyKey> <PropertyValue>)|
         (source <String> <URL>)|
-        (start|starttime (allday <Date>)|<Time>)|
+        (start (allday <Date>)|<Time>)|
         (status confirmed|tentative|cancelled)|
         (summary <String>)|
         tentative|
@@ -3827,17 +3827,25 @@ gam <UserTypeEntity> print backupcodes|verificationcodes [todrive <ToDriveAttrib
         ((calendars <CalendarList>) | <FileSelector> | <CSVFileSelector> | <CSVkmdSelector> | <CSVDataSelector>)|
         <CalendarSelectProperty>*
 
-<CalendarACLScope> ::= <EmailAddress>|user:<EmailAdress>|group:<EmailAddress>|domain:<DomainName>)|domain|default
-<CalendarACLScopeList> ::= "<CalendarACLScope>(,<CalendarACLScope>)*"
-<CalendarACLScopeEntity>::= <CalendarACLScopeList> | <FileSelector> | <CSVFileSelector> | <CSVkmdSelector> | <CSVDataSelector>
-
+<CalendarACLScope> ::=
+        <EmailAddress>|user:<EmailAdress>|group:<EmailAddress>|domain:<DomainName>)|domain|default
+<CalendarACLScopeList> ::=
+        <CalendarACLScope>(,<CalendarACLScope>)*
+<CalendarACLScopeEntity>::=
+        <CalendarACLScopeList> | <FileSelector> | <CSVFileSelector> | <CSVkmdSelector> | <CSVDataSelector>
+
+<CalendarEmailNotificatonEventType> ::=
+        eventcreation|eventchange|eventcancellation|eventresponse|agenda
+<CalendarEmailNotificatonEventTypeList> ::=
+        "<CalendarEmailNotificatonEventType>(,<CalendarEmailNotificatonEventType>)*"
+				   
 <CalendarAttribute> ::=
         (backgroundcolor <ColorValue>)|
         (color <CalendarColorName>)|
         (colorindex|colorid <CalendarColorIndex>)|
         (foregroundcolor <ColorValue>)|
         (hidden <Boolean>)|
-        (notification clear|(email eventcreation|eventchange|eventcancellation|eventresponse|agenda))|
+        (notification clear|(email <CalendarEmailNotificatonEventTypeList>))|
         (reminder clear|(email|pop <Number>)|(<Number> email|pop))|
         (selected <Boolean>)|
         (summary <String>)
diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt
index 5d7251b0..1069f8a2 100644
--- a/src/GamUpdate.txt
+++ b/src/GamUpdate.txt
@@ -1,3 +1,21 @@
+6.00.04
+
+Updated `<CalendarAttribute>` to allow specifying a list of email notification event types.
+
+Previously, you had to specify each email notification event type individually (this still works).
+```
+<CalendarEmailNotificatonEventType> ::=
+        eventcreation|eventchange|eventcancellation|eventresponse|agenda
+<CalendarEmailNotificatonEventTypeList> ::= 
+        <CalendarEmailNotificatonEventType>(,<CalendarEmailNotificatonEventType>)*
+
+<CalendarAttribute> ::=
+...
+        (notification clear|(email <CalendarEmailNotificatonEventTypeList>))|
+
+gam user user@domain.con update calendar primary notification email eventchange,eventcancellation
+```
+
 6.00.03
 
 Fixed bug in `gam calendar update event` introduced in 5.34.02 where updating an event's start or end time appeared to work
diff --git a/src/gam/__init__.py b/src/gam/__init__.py
index d0052e48..0d648fda 100755
--- a/src/gam/__init__.py
+++ b/src/gam/__init__.py
@@ -23,7 +23,7 @@
 """
 
 __author__ = 'Ross Scroggs <ross.scroggs@gmail.com>'
-__version__ = '6.00.03'
+__version__ = '6.00.04'
 __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 import base64
@@ -35779,8 +35779,14 @@ def _getCalendarAttributes(body):
       body.setdefault('notificationSettings', {'notifications': []})
       method = getChoice(CALENDAR_NOTIFICATION_METHODS+Cmd.CLEAR_NONE_ARGUMENT)
       if method not in Cmd.CLEAR_NONE_ARGUMENT:
-        body['notificationSettings']['notifications'].append({'method': method,
-                                                              'type': getChoice(CALENDAR_NOTIFICATION_TYPES_MAP, mapChoice=True)})
+        for ntype in _getFieldsList():
+          if ntype in CALENDAR_NOTIFICATION_TYPES_MAP:
+            body['notificationSettings']['notifications'].append({'method': method,
+                                                                  'type': CALENDAR_NOTIFICATION_TYPES_MAP[ntype]})
+          else:
+            invalidChoiceExit(ntype, CALENDAR_NOTIFICATION_TYPES_MAP, True)
+      else:
+        body['notificationSettings']['notifications'] = []
     else:
       unknownArgumentExit()
   return colorRgbFormat