Change from int to BigInteger
Add back commented code