Added demo code fo no amount option and simplify code.