Revamped JCalculation