Made the index 2 demo a bit more practical.