re implementing separate indexes