Adding internal calculations and validation of wallet altered