Index made better