Added demo code fo no amount option and simplify code.

Merge this after the server side code is deployed.