diff --git a/source/_components/group.markdown b/source/_components/group.markdown
index 4815d75e213..6fc90a36e50 100644
--- a/source/_components/group.markdown
+++ b/source/_components/group.markdown
@@ -10,18 +10,35 @@ footer: true
 ha_category: Organization
 ---
 
-Groups allow the user to combine multiple entities into one. If all entities are switches or lights they can be controlled as one with a switch at the top of the card.
+Groups allow the user to combine multiple entities into one.
+
+Check the **Set State** page from the **Developer Tools** and browse the **Current entities:** listing for all available entities.
+
+
+```yaml
+# Example configuration.yaml entry
+group:
+  information:
+    - sensor.time
+  living_room:
+    - binary_sensor.tv
+    - sensor.living_room_temperature
+  kitchen:
+    - switch.kitchen_pin_3
+    - sensor.oven_temperature
+```
+
+If all entities are switches or lights they can be controlled as one with a switch at the top of the card. Grouped states should share the same type of states (ON/OFF or HOME/NOT_HOME).
 
 ```yaml
 # Example configuration.yaml entry
-# A comma seperated list of states that have to be tracked as a single group
-# Grouped states should share the same type of states (ON/OFF or HOME/NOT_HOME)
 group:
   living_room:
-    - light.Bowl
-    - light.Ceiling
-    - light.TV_back_light
+    - light.bowl
+    - light.ceiling
+    - light.tv_back_light
   children:
    - device_tracker.child_1
    - device_tracker.child_2
 ```
+