diff --git a/src/garmin_parser.c b/src/garmin_parser.c
index c33400f..cb3c8d4 100644
--- a/src/garmin_parser.c
+++ b/src/garmin_parser.c
@@ -161,14 +161,29 @@ static void garmin_event(struct garmin_parser_t *garmin,
 		const char *name;
 	} event_desc[] = {
 		[0] =  { 2, "Deco required" },
-		[3] =  { 2, "First ceiling" },
-		[4] =  { 3, "ppO2 violation" },
+		[1] =  { 2, "Gas Switch prompted" },
+		[2] =  { 1, "Surface" },
+		[3] =  { 2, "Approaching NDL" },
+		[4] =  { 3, "ppO2 warning" },
+		[5] =  { 4, "ppO2 critical high" },
+		[6] =  { 4, "ppO2 critical low" },
 		[7] =  { 2, "Time alert" },
 		[8] =  { 2, "Depth alert" },
+		[9] =  { 3, "Deco ceiling broken" },
+		[10] = { 1, "Deco completed" },
 		[11] = { 3, "Safety stop ceiling broken" },
 		[12] = { 1, "Safety stop completed" },
-		[17] = { 2, "Ascent speed too high" },
+		[13] = { 3, "CNS warning" },
+		[14] = { 4, "CNS critical" },
+		[15] = { 3, "OTU warning" },
+		[16] = { 4, "OTU critical" },
+		[17] = { 3, "Ascent speed critical" },
+		[18] = { 1, "Alert dismissed" },
+		[19] = { 1, "Alert timed out" },
+		[20] = { 3, "Battry Low" },
+		[21] = { 3, "Battry Critical" },
 		[22] = { 1, "Safety stop begin" },
+		[23] = { 1, "Approaching deco stop" },
 	};
 	dc_sample_value_t sample = {0};