previous charge logic removed