split 2 calculators, quick temp fix appended for it to still work