Improved demo
Improved some more