WIP: working on updating index view