change to avoid having to pass 'going_to_charge' as userdata between sta...

...tes