last tweaks for demo