safe indexing?
change shelves schema