diff --git a/config/HBAT2.yaml b/config/HBAT2.yaml
index 74c086c4836c346a6005c88bddb8eaf0093b00b2..5b328bb4c75f8d275b912c1fc01545817eb30ed4 100644
--- a/config/HBAT2.yaml
+++ b/config/HBAT2.yaml
@@ -4,7 +4,8 @@ description: "1234"
 drivers:
  - name: hbaio #TCA9548
    type: hbat_pico_io
-   parameters: ['/dev/ttyACM0'] #serial port number
+#   parameters: ['/dev/ttyACM0'] #serial port number
+   parameters: ['COM3'] #serial port number
  - name: hbat2
    type: i2c_array #An array of similar devices connected to an I2C switch
    parent: hbaio
@@ -29,19 +30,28 @@ device_registers:
    - name: X4
      address: 0x3
      store: True
-   - name: Y
+   - name: Y1
      address: 0x4
      store: True
+   - name: Y2
+     address: 0x5
+     store: True
+   - name: Y3
+     address: 0x6
+     store: True
+   - name: Y4
+     address: 0x7
+     store: True
    - name: SWX
      address: 0x8
      store: True
    - name: SWY
      address: 0x9
      store: True
-   - name: FE_FE_PWR
+   - name: FE_PWR
      address: 0xA
      store: True
-   - name: FE_BF_PWR
+   - name: BF_PWR
      address: 0xB
      store: True
    - name: ID
@@ -81,7 +91,7 @@ variables:
      mask: HBAT2_BF_mask
      dim: 4
 
-   - name: DELAYS_X_G1
+   - name: HBAT2_DELAYS_X_G1
      description: Group1 delays
      driver: hbat2
      devreg: [BF.X1,BF.X2,BF.X3,BF.X4]
@@ -92,7 +102,7 @@ variables:
      dim: 16
      mask: HBAT2_ANT_mask
 
-   - name: DELAYS_X_G2
+   - name: HBAT2_DELAYS_X_G2
      description: Group2 delays
      driver: hbat2
      devreg: [BF.X1]
@@ -103,6 +113,68 @@ variables:
      dim: 4
      mask: HBAT2_BF_mask
 
+   - name: HBAT2_ID
+     description: Unique HBAT ID
+     driver: hbat2
+     devreg:  BF.ID
+     width: 32
+     rw:  ro
+     dtype: uint32
+     dim: 4
+     mask: HBAT2_BF_mask
+
+   - name: HBAT2_VERSION
+     description:  HBAT software version
+     driver: hbat2
+     devreg:  BF.VERSION
+     width: 32
+     rw:  ro
+     dtype: uint32
+     dim: 4
+     mask: HBAT2_BF_mask
+
+   - name: [HBAT2_LED0,HBAT2_PWR_X,HBAT2_PWR_Y,HBAT2_PWR_FEs]
+     driver: hbat2
+     devreg:  BF.BF_PWR
+     bitoffset: [0,2,3,4]
+     width: 1
+     rw:  rw
+     dtype: boolean
+     dim: 4
+     mask: HBAT2_BF_mask
+
+   - name: HBAT2_PWR_FE
+     driver: hbat2
+     devreg:  BF.FE_PWR
+     bitoffset: [0,1,2,3]
+     width: 1
+     rw:  rw
+     dtype: boolean
+     dim: 16
+     mask: HBAT2_ANT_mask
+
+   - name: HBAT2_BEAMFORM
+     driver: hbat2
+     devreg:  BF.SWX
+     bitoffset: 0
+     width: 5
+     rw:  rw
+     dtype: string
+     dim: 4
+     mask: HBAT2_BF_mask
+#     lookup: {ANT0:0, ANT1:4, ANT2:1, ANT3:2, BF:14}
+
+   - name: HBAT2_V1
+     driver: hbat2
+     devreg:  BF.VSENSE
+     bitoffset: 0
+     width: 8
+     rw:  ro
+     dtype: float
+     scale : 1
+     dim: 4
+     mask: HBAT2_BF_mask
+
 methods:
   - name: LOAD_EEPROM
     driver: hbat2