Changes to join & index
 Tried to fix things