Make some changes to index_fluid