diff --git a/msg/Task.msg b/msg/Task.msg
index d1db1a8d49a7767bb34564aa3bf7270933472625..51eb244c23a5e203eb8b18af8c86c323bc57924e 100644
--- a/msg/Task.msg
+++ b/msg/Task.msg
@@ -24,27 +24,37 @@ uint32 TASK_STATE_FAILED = 10
 uint32 TASK_STATE_ABORTED = 11
 uint32 TASK_STATE_FINISHED = 12
 
-uint32 TASK_KIND_NONE = 0      # No information about kind of task
+uint32 TASK_KIND_NONE = 0         # No information about kind of task
 uint32 TASK_KIND_POSITION_2D = 1  # Execution of task takesplace near given pos
 uint32 TASK_KIND_POSITION_3D = 2  # Execution of task takesplace near given pos
 
 
-string uuid               # if "json-tst" this cannot be the same as the root uuid, root uuid cannot be set
-uint32 kind   # Kind of task.
+string uuid                  # if "json-tst" this cannot be the same as the root uuid, root uuid cannot be set
+uint32 kind                  # Kind of task.
 geographic_msgs/GeoPoint gp  # Interpreted according to type info
-string cid                # If non-empty use this as the conversation id in the delegation
+string cid                   # If non-empty use this as the conversation id in the delegation
 string name
 string desc
-int32 priority            # Lower number means higher priority. Use values in range 1-100
+string type                  # The type of the task. Possible values: "json-tst"
+string task                  # The task string
+string preferred_unit        # If non-empty the preferred unit for this task.
+string forced_unit           # If non-empty the forced unit for this task.
+bool retry_exec_failure      # If true retry execution failures (also remove the agent that failed).
+bool bidding_in_delegation   # If true, do bidding in delegation when applicable.
+string tst_root_uuid         # Root uuid for TST tree, can change with same task_uuid
+
+#
+# Can be changed when task is on the queue
+#
+
+int32 priority               # Lower number means higher priority. Use values in range 1-100
+
+#
+# The part below is information/status part.  This information dependas on what the task manager have done.
+#
+
+uint32 state                 # The state if the task is handled by a task execution queue
+bool active                  # If false the task is not active if placed on a task executuion queue
+string unit                  # The unit doing the execution
 uint32 n_failed_delegations
-string type    # The type of the task. Possible values: "json-tst"
-string task    # The task string
-uint32 state              # The state if the task is handled by a task execution queue
-bool active               # If false the task is not active if placed on a task executuion queue
-string unit               # The unit doing the execution
-string preferred_unit     # If non-empty the preferred unit for this task.
-string forced_unit        # If non-empty the forced unit for this task.
-bool retry_exec_failure   # If true retry execution failures (also remove the agent that failed).
-bool bidding_in_delegation # If true, do bidding in delegation when applicable.
-string[] no_good_units    # List of units that have failed to do the task and should not be considered.
-string tst_root_uuid      # Root uuid fot TST tree, can change with same task_uuid
+string[] no_good_units       # List of units that have failed to do the task and should not be considered.