Changed and simplified the demo a little