bug fix and demo