More cleanup on the demo
fixed index