Didn't end up needing separate calculators