Fixing the demo
Fix specs
Fix demo for real