more work done for indexes, very close