- added new ChargesCalculator (testing using NonLC)