new demo and some tweaks