More changes to charges controller.