Improved charge command