fixed the demo w.r.t. reviewer 1 comments