added charge code back to events