Update index to make it more fluid