Combined world and index.
Merged changes to index.