Updated charges controller