Charger patches
Merge my updates