diff --git a/lib/structs.json b/lib/structs.json
index 99677bf..f66a09c 100644
--- a/lib/structs.json
+++ b/lib/structs.json
@@ -3,7 +3,8 @@
 
     "---- Channel A ----": "---------------------------------------------",
     "[A] AF": {
-        "serial":     [  4, "s16", ""                                     ]
+        "comment":    "PowerStream Serial",
+        "serial":     [  3, "s16", ""                                     ]
     },
 
     "---- Channel B ----": "---------------------------------------------",
@@ -71,6 +72,41 @@
     "37": {
         "sample":     100
     },
+    "3C": {
+        "comment":     "This is the golden msg for battery to powerstream",
+        "serial":     [  3,  "s16", "onLineModuleSnList[x].moduleSn"      ],
+        "soc":        [  56,  "u8", "bp2000._serial_.soc"                 ],
+        "volt":       [  57, "u16", "bp2000._serial_.vol"                 ],
+        "temp":       [  42,  "u16", "bp2000._serial_.temp"               ],
+        "remainTime": [  124, "u16", "bp2000._serial_.remainTime"         ],
+        "bmsChgUpln": [  128, "u8", "bp2000._serial_.bmsChgUpln"          ],
+        "bmsChgDnln": [  129, "u8", "bp2000._serial_.bmsChgDownln"        ]
+    },
+    "13": {
+        "maxBattVol": [  3, "u16", "bp2000._serial_.maxVol"               ],
+        "minBattVol": [  12, "u16", "bp2000._serial_.minVol"              ],
+        "temp":       [  20,  "u8", "bp2000._serial_.temp"                ],
+        "maxCellVol": [  39, "u16", "bp2000._serial_.maxCellVol"          ],
+        "minCellVol": [  41, "u16", "bp2000._serial_.minCellVol"          ],
+        "cell_1":     [  75, "u16", "bp2000._serial_.c1"                  ],
+        "cell_2":     [  77, "u16", "bp2000._serial_.c2"                  ],
+        "cell_3":     [  79, "u16", "bp2000._serial_.c3"                  ],
+        "cell_4":     [  81, "u16", "bp2000._serial_.c4"                  ],
+        "cell_5":     [  83, "u16", "bp2000._serial_.c5"                  ],
+        "cell_6":     [  85, "u16", "bp2000._serial_.c6"                  ],
+        "cell_7":     [  87, "u16", "bp2000._serial_.c7"                  ],
+        "cell_8":     [  89, "u16", "bp2000._serial_.c8"                  ],
+        "cell_9":     [  91, "u16", "bp2000._serial_.c9"                  ],
+        "cell_10":    [  93, "u16", "bp2000._serial_.c10"                 ],
+        "cell_11":    [  95, "u16", "bp2000._serial_.c11"                 ],
+        "cell_12":    [  97, "u16", "bp2000._serial_.c12"                 ],
+        "cell_13":    [  99, "u16", "bp2000._serial_.c13"                 ],
+        "cell_14":    [  101, "u16", "bp2000._serial_.c14"                ],
+        "cell_15":    [  103, "u16", "bp2000._serial_.c15"                ],
+        "cell_16":    [  105, "u16", "bp2000._serial_.c16"                ],
+        "serial":     [  122,  "s16", "bp2000._serial_.moduleSn"          ],
+        "volt":       [  148,  "u16", "bp2000._serial_.volt"              ]
+    },
     "3F": {},
     "49": {
         "sample":     1
@@ -236,6 +272,12 @@
         "Set_PVIn1":  [  0, "u8", ""                                      ],
         "Set_PVIn2":  [  1, "u8", ""                                      ]
     },
+    "AA:21": {
+        "sample":     10,
+        "serial":     [  0, "s16", "onLineModuleSnList[x].moduleSn"       ],
+        "errCode":    [ 16, "u16", "bbcin._serial_.errCode"               ],
+        "modVer":     [ 20, "dqr", "onLineModuleSnList[x].moduleVersion"  ]
+    },
     "AB": {
         "comment":    "coincides with toggling solar input"
     },
@@ -294,7 +336,8 @@
     },
     "C3": {},
     "C4:03": {
-        "serial":     [  4, "s16", ""                                     ]
+        "comment":    "PowerStream Serial",
+        "serial":     [  3, "s16", ""                                     ]
     },
     "CB": {
         "sample":     100,