Switched to BigDecimal