added changes to charge assignement method