Improved this demo a bit