Revert "Revert "fastcharge: New enhancements""

This reverts commit ce4e72bee81b4ff1013724dd413c081be6494d3c.