Now uses decimals properly