#17 more demo stuff