Small fix + made Demo5 more interesting :)