diff --git a/health/HealthMessage.cpp b/health/HealthMessage.cpp
index 1bb29526..52479c26 100644
--- a/health/HealthMessage.cpp
+++ b/health/HealthMessage.cpp
@@ -7,11 +7,13 @@ void HealthMessage::setHealthMessage(CommandMessage* message, Command_t command,
 	message->setParameter2(oldHealth);
 }
 
-void HealthMessage::setHealthMessage(CommandMessage* message, Command_t command) {
+void HealthMessage::setHealthMessage(CommandMessage* message,
+        Command_t command) {
 	message->setCommand(command);
 }
 
-HasHealthIF::HealthState HealthMessage::getHealth(const CommandMessage* message) {
+HasHealthIF::HealthState HealthMessage::getHealth(
+        const CommandMessage* message) {
 	return (HasHealthIF::HealthState) message->getParameter();
 }
 
diff --git a/health/HealthMessage.h b/health/HealthMessage.h
index de4923ab..fb979c66 100644
--- a/health/HealthMessage.h
+++ b/health/HealthMessage.h
@@ -7,17 +7,20 @@
 class HealthMessage {
 public:
 	static const uint8_t MESSAGE_ID = messagetypes::HEALTH_COMMAND;
-	// REPLY_COMMAND_OK/REPLY_REJECTED
+
 	static const Command_t HEALTH_SET = MAKE_COMMAND_ID(1);
-	// NO REPLY!
-	static const Command_t HEALTH_ANNOUNCE = MAKE_COMMAND_ID(3);
+	// No reply expected, health will be announced as event!
+	static const Command_t HEALTH_ANNOUNCE = MAKE_COMMAND_ID(2);
+	// Same as before, but all objects in health table will
+	// announce their health as events.
+	static const Command_t HEALTH_ANNOUNCE_ALL = MAKE_COMMAND_ID(3);
+
 	static const Command_t HEALTH_INFO = MAKE_COMMAND_ID(5);
 	static const Command_t REPLY_HEALTH_SET = MAKE_COMMAND_ID(6);
 
 	static void setHealthMessage(CommandMessage *message, Command_t command,
 			HasHealthIF::HealthState health,
 			HasHealthIF::HealthState oldHealth = HasHealthIF::FAULTY);
-
 	static void setHealthMessage(CommandMessage *message, Command_t command);
 
 	static HasHealthIF::HealthState getHealth(const CommandMessage *message);