Fix spec demo, not complete yet