Moving the Amount Calculation