Tweak the amount handling
Update the amount multiplication