Remove Decimal conversion and use whole ints