bug fix + demo